Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 23:30:50 +0000 (23:30 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 23:30:50 +0000 (23:30 +0000)

Trivial merge